I think that history has shown us time and time again that the best way to defeat bad ideas is with good ideas. That it is far more effective to educate than it is to legislate.
Make no mistake, we have our work cut out for us. The simple idea that freedom of religion is not freedom to trespass on other people's rights - seems, at times, to be a foreign idea here in the US. Which is an indication we haven't been effective in communicating this basic fact.
But we are making progress. Slow progress. But progress none the less. We are dragging Christianity, kicking and screaming, onto a higher moral plane. Women's equality, women's health, LGBT rights, informed marriages (living "out of wedlock" first), etc. These have all been proven to be healthy for our society.
I don't know if there's been a study on it, but it seems that Christianity in the US is also becoming a lot less tribalistic. It was a huge deal in the 60s that Kennedy was a Catholic. But last election next to nobody cared that Romney was a Mormon. And now this election it hasn't even been brought up that Bernie is a Jew.
All that aside, I think one of the best possible things we could do is to start phasing out religions tax exempt status. If their doing charity work - then they can show proof of that just like everyone else and qualify that way. I think it would encourage a lot of religions to be more generous. And the ones like the Society who aren't - it would further expose their true colors.